default-jvm-cfg

Gbp-Pq: Name default-jvm-cfg.diff

diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c
index 1afdb5f40ac73f60de384582984d86621201bdae..d8af12a966464e2c07cf946444469048ab826e94 100644 (file)
--- a/src/java.base/share/native/libjli/java.c
+++ b/src/java.base/share/native/libjli/java.c
@@ -2055,7 +2055,7 @@ jint
 ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
 {
     FILE *jvmCfg;
-    char line[MAXPATHLEN+20];
+    char line[MAXPATHLEN+30];
     int cnt = 0;
     int lineno = 0;
     jlong start = 0, end = 0;
@@ -2068,6 +2068,11 @@ ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
     }
 
     jvmCfg = fopen(jvmCfgName, "r");
+    if (jvmCfg == NULL) {
+      char cfgName[strlen(jvmCfgName)+10];
+      sprintf(cfgName, "%s-default", jvmCfgName);
+      jvmCfg = fopen(cfgName, "r");
+    }
     if (jvmCfg == NULL) {
       if (!speculative) {
         JLI_ReportErrorMessage(CFG_ERROR6, jvmCfgName);